From 410dee652685d7cb501781599d873039792b4c1c Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Wed, 30 Jul 2003 21:39:24 +0000 Subject: [PATCH] bitkeeper revision 1.388 (3f283b0cfdRYEH7pRqoQr9Mnt8MHmQ) network.c, dev.c: Strengthen the memory barriers used for lock-free synchronisation in Xenolinux-Xen network code interface. --- xen/net/dev.c | 2 +- xenolinux-2.4.21-sparse/arch/xeno/drivers/network/network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/net/dev.c b/xen/net/dev.c index e9e965c7e9..cd5c80111a 100644 --- a/xen/net/dev.c +++ b/xen/net/dev.c @@ -840,7 +840,7 @@ static void tx_skb_release(struct sk_buff *skb) * Checks below must happen after the above response is posted. * This avoids a possible race with a guest OS on another CPU. */ - smp_rmb(); + smp_mb(); if ( (vif->tx_cons == vif->tx_prod) && get_tx_bufs(vif) ) { diff --git a/xenolinux-2.4.21-sparse/arch/xeno/drivers/network/network.c b/xenolinux-2.4.21-sparse/arch/xeno/drivers/network/network.c index 9abe713a8a..3d12699799 100644 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/network/network.c +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/network/network.c @@ -318,7 +318,7 @@ static int network_start_xmit(struct sk_buff *skb, struct net_device *dev) np->stats.tx_packets++; /* Only notify Xen if there are no outstanding responses. */ - smp_wmb(); + smp_mb(); if ( np->net_idx->tx_resp_prod == i ) HYPERVISOR_net_update(); -- 2.30.2